Ancillary definitions used across modules.
General code clean-up, polishing.