Continued refactoring: switch from signal/slot macro connections to lambda functions.