Fix code smells in files modified by #461