Removed some spurious inlines and extensions