Correctly populate the constant and function menus (Bug #527545)