Remove ad-hoc syntactic sugar