The `-' token has special meaning, so it must be reserved. Minor
improvements as well.