Eliminate subroutine calls to squeeze more blood from the stone.
Fix some regexes to remove unnecessary trailing/leading whitespace
regex.
Bump to 2.3