Moved some Ember logic over to the builder.