Streamline block comment code path

Related to #258