Cleanup. Also, accept non-lowercase literals.