Merge "Simplifying programmatic creation."