Misc. rewrites: