Alterations to ensure functions take non-evaluated arguments. This will be further improved upon later with better code.
Adjusting for StyleCop