More refactoring is DrawableBuilder to better support the animation system.