Remove reflection where reasonable; closes #91 and fixes #86

Daniel Lehmberg requested to merge remove_reflection into develop

Merge request reports