Bit of organization, prep for last 1.9 needs