Cleanup usage of enable_if