Minor changes (disallow fallthrough, use strict equality)