Use simplier approach for converting shorthands

* Uses simplier approach for converting shorthands
* Allows specifing number of values in the resulting syntax