Guideline fixes for Pascal OOP

Fixes #14