Cleanup

Hopefully JITs can still optimize this. These are just folded into
default now.