Some more Meteor type clean up.