Add: minor improvements to the parsing of routine definitions;
Fix: a couple of recent bugs.