Refactor stuff, remove the method/property factories - testing too hard with 'em.