Changes to remove inline as it doesn't work on all systems.