Fixes #24 so that the match starting forms are easier to read.