Fixes #190 - additional optimalization opportunity by taking advantage of prior shorthands with many defaults
Fixes some corner cases for #190