Removed a hack made redundant by the improved support for inlines