Minor bugfixes and slight improves to the code body parsing.