Clean up a lot of code (mostly init methods) and fix a missing rethrow.