Clean up a little; do not create an alias that is only used once, or store
attributes with constant values in an instance.