Fixes validation and expansion of short-hand procedure
definitions.
Fixes code comment.