Various small architecture improvements.