Un-magic-afy a magic number, and fix test harness for mixins