Issue #2331461 by Berdir: Clean up entity handlers/forms, chasing HEAD.