Merged and extended support of custom layout issues, as well as allowing view locals to be passed as either the first or second arg.