Small refactorings. Inlined expressions, removed redundant initializers, etc.