Moved out parsing of rules with and without args
Simply so that the flow of the code is a bit simpler