Removed old reference, more dilligent useage of 'inline' though it
probably won't make much difference.