More more more. May not seem cleaner, but it is... I think. See #295