Added aperture macro parsing, including arithmetic expression parser