Replaced magic numbers with regex named groups.