Made progress towards a cleaner syntax.