Allow commas in more entry_page subs.
Removed redundant whitespace trimming.