Expand some short forms