Make oncommand handle capitalization better.