Reintroduce INLINEs (closes #7)