Include toplevel options in alignment calculation

Fixes #22