Removed various hacks now that the support for inlines is vastly improved.

Signed-off-by: Dimitar Dobrev <dpldobrev@yahoo.com>