.NET 4.5, some cleanup.
Moving creators to extension methods.