Hmm, I didn't actually test my comment with compilation. Give me some time to test it. Ignore this for the moment. I'll compile-test it later though.