Further bug-swatting following refactor (sigh).