Ehh, I don't know if this commit is even going to be necessary if the layering penalties thing Kevin is talking about goes through. I'll close this commit and bring it back up if it's actually needed.