More clean-ups after further discussion with Holger