Penance for my sins against proper modularization