As I threatened, I changed the argument orders for the nice restraints and for the scoring functions so that the score function or unary function is always first. Notes about these conventions have been put in various base classes. XYZDecorator.h should be committed separately as the only change to there is to make the get_xyz_keys function static rather than const.