Just some tiny clean-ups.