#15: Moved from header to implementation file.