Merge Joona's razoring tweaks