Replace more conditionals with knockout