Issue #3: Just some more clean-up in the CPU back-end