Added deshortify_always (got lost outside VCS) and a few more deshorteners