- Minor fixes, forgot to reinsert code for runprefix and runsuffix
during refactor.