Remove unneeded flexibility, clean up & fix executeBare.