Various bug fixes with exceptions and conditionals resulting from generalization of identifier rules.