Merge "Clean up constructor and derivation whitespace"