Patch 3

This is a two-parter. Needs corresponding changes to functions.php (separate pull immediately after this one).