Guideline fixes for Pascal

Fixes #24