This greatly reduces our lines of code. Also I thought it might improve performance to address #135 but it didn't make any difference.