Some clean-up and merged primitive converters