Improved functionality and cleanliness of the /i command.