Worked out solutions for "FIXME" nodes. Closes #1.